By Malcrom, closes #15662 (cherry picked from commit 976ab4d2aee22f445320c48ec336d35328f919da)
hotfixes