Merge branch 'hotfix/5.4_fix_2'
Merge branch 'master' into develop