surrogate-1: feature cycle 20260511-091942-surrogat

Commit 8827692 on surrogate-1: feature cycle 20260511-091942-surrogat