surrogate-1: feature cycle 20260511-091917-surrogat

Commit d973975 on surrogate-1: feature cycle 20260511-091917-surrogat