surrogate-1: feature cycle 20260511-095719-surrogat

Commit 91952b8 on surrogate-1: feature cycle 20260511-095719-surrogat