2.4.9-alpha2
migrated pull request #11459 to 2.3 develop
AC-2701:: Roll back and Fixed the static tests