Merged after local lint/typecheck/unit/E2E verification. The PR check remained pending with no failure attached.