surrogate-1: feature cycle 20260511-095551-surrogat

Commit 4a9c8a2 on surrogate-1: feature cycle 20260511-095551-surrogat