surrogate-1: feature cycle 20260511-102134-surrogat

Commit 794d054 on surrogate-1: feature cycle 20260511-102134-surrogat