Merge main into feat/v1.98-phase2-feature-flag

Bring branch current with main (which has the merged PR-13 at 2f64d5a /
PR #459). Our branch's content was already inherited pre-merge — this
reconciles the history topology so PR #461 can close the BEHIND status
before merge.

Author: itcmsgr