surrogate-1: feature cycle 20260511-095623-surrogat

Commit 3225c62 on surrogate-1: feature cycle 20260511-095623-surrogat