2.4.6-p14
Merge remote-tracking branch 'origin/2.4-develop' into Hammer_246_Scope_14dec2022
migrated pull request #11459 to 2.3 develop