Closes #8158 Closes #14598 (cherry picked from commit d476e0eff24af5849bbbc21128aa461a24d4fe9b)
hotfixes