#ci clear

Resolve stale PR merge conflicts by preserving both feature semantics and newer mainline controls