surrogate-1: feature cycle 20260511-093342-surrogat

Commit 9b075b5 on surrogate-1: feature cycle 20260511-093342-surrogat