Closes #12448 By Rushor (cherry picked from commit 445e6e6fddcdb7585c19c70bc0413a8531a0e215)
hotfixes