Merge remote-tracking branch 'remotes/origin/2024Q2_RC' into develop