surrogate-1: feature cycle 20260511-100645-surrogat

Commit f4837e4 on surrogate-1: feature cycle 20260511-100645-surrogat