surrogate-1: feature cycle 20260511-091208-surrogat

Commit b8fad05 on surrogate-1: feature cycle 20260511-091208-surrogat