Merge branch 'hotfix/2.4.6'
Did the same fix again
Merge branch 'hotfix/2.4.7' into develop