surrogate-1: feature cycle 20260511-095543-surrogat

Commit e0cd863 on surrogate-1: feature cycle 20260511-095543-surrogat