surrogate-1: feature cycle 20260511-102102-surrogat

Commit 2e16f4a on surrogate-1: feature cycle 20260511-102102-surrogat