Closes #4427 Closes #7091 (cherry picked from commit 2792046dc7a229180d27dfdc4ce37ccfb84c8a27)
hotfixes