surrogate-1: feature cycle 20260511-102134-surrogat

Commit 2eefacc on surrogate-1: feature cycle 20260511-102134-surrogat