surrogate-1: feature cycle 20260511-095711-surrogat

Commit b8eba90 on surrogate-1: feature cycle 20260511-095711-surrogat