by sirikfoll Closes #6880 (cherry picked from commit 144b9c34c4663767839428d5afa6c604ea1f190e)
hotfixes