surrogate-1: feature cycle 20260511-091909-surrogat

Commit 2514d92 on surrogate-1: feature cycle 20260511-091909-surrogat