Closes #11754 Thanks to ariel- (cherry picked from commit 3cc89c32d551baf8fbc0c4787b79d7e2f7bde2bd)
hotfixes