surrogate-1: feature cycle 20260511-095655-surrogat

Commit d520f02 on surrogate-1: feature cycle 20260511-095655-surrogat