Branch force pushed by b_sharpe at 2025-10-14T17:59:22+00:00, 3525727-compatibility-merge moved from this tag to 058b24efc24bec17bd18a6d29903c12ea459b656