2.4.9-alpha1
Code review - removed unnecessary deploy config check
migrated pull request #11459 to 2.3 develop