surrogate-1: feature cycle 20260511-091853-surrogat

Commit eea5069 on surrogate-1: feature cycle 20260511-091853-surrogat