surrogate-1: feature cycle 20260511-091541-surrogat

Commit 4d79919 on surrogate-1: feature cycle 20260511-091541-surrogat