Branch force pushed by b_sharpe at 2025-10-21T20:54:21+00:00, 3525727-compatibility-merge moved from this tag to 7db61e8fad8ea9c31a17971be82f604a32e62baf