surrogate-1: feature cycle 20260511-091541-surrogat

Commit b864eb9 on surrogate-1: feature cycle 20260511-091541-surrogat