By MrSmite, closes #15531 (cherry picked from commit c5cc7cca3e29e176b5ec0405a05c3db8e19c4e93)
hotfixes