surrogate-1: feature cycle 20260511-095535-surrogat

Commit ac4515e on surrogate-1: feature cycle 20260511-095535-surrogat