surrogate-1: feature cycle 20260511-102118-surrogat

Commit 8de5377 on surrogate-1: feature cycle 20260511-102118-surrogat