2.4.8
Merge remote-tracking branch 'origin/2.4-develop' into AC-13818
migrated pull request #11459 to 2.3 develop