2.4.8
Merge branch '2.4.8-develop' into lynx-2.4.8
fix static failure 2
migrated pull request #11459 to 2.3 develop