surrogate-1: feature cycle 20260511-091200-surrogat

Commit dfcebbf on surrogate-1: feature cycle 20260511-091200-surrogat