surrogate-1: feature cycle 20260511-093350-surrogat

Commit f8af5d1 on surrogate-1: feature cycle 20260511-093350-surrogat