2.4.9-alpha2
Merge remote-tracking branch 'origin/AC-14807' into spartans_pr_25062025
migrated pull request #11459 to 2.3 develop