surrogate-1: feature cycle 20260511-100621-surrogat

Commit 7f52546 on surrogate-1: feature cycle 20260511-100621-surrogat