surrogate-1: feature cycle 20260511-100613-surrogat

Commit 1947e8a on surrogate-1: feature cycle 20260511-100613-surrogat