surrogate-1: feature cycle 20260511-095631-surrogat

Commit b57c56b on surrogate-1: feature cycle 20260511-095631-surrogat