Updates #11418 By sirikfoll (cherry picked from commit f1feb5ac30ff099005d818b788bcedb2ebfe88d0)
hotfixes