surrogate-1: feature cycle 20260511-091144-surrogat

Commit 3849042 on surrogate-1: feature cycle 20260511-091144-surrogat