surrogate-1: feature cycle 20260511-091921-surrogat

Commit c58032c on surrogate-1: feature cycle 20260511-091921-surrogat