surrogate-1: feature cycle 20260511-091224-surrogat

Commit 8e0bbe8 on surrogate-1: feature cycle 20260511-091224-surrogat