surrogate-1: feature cycle 20260511-091901-surrogat

Commit 43317a5 on surrogate-1: feature cycle 20260511-091901-surrogat