surrogate-1: feature cycle 20260511-091845-surrogat

Commit 39c75ee on surrogate-1: feature cycle 20260511-091845-surrogat