Merge branch 'hotfix/5464'

Close #5464