surrogate-1: feature cycle 20260511-095703-surrogat

Commit 3c564eb on surrogate-1: feature cycle 20260511-095703-surrogat