surrogate-1: feature cycle 20260511-095647-surrogat

Commit aea5e0f on surrogate-1: feature cycle 20260511-095647-surrogat