By sirikfoll Closes #12909 (cherry picked from commit 4a3967c8c2a6b9ad3b51c9cd384e24673454919e)
hotfixes