Merge branch 'hotfix/4687'

Close #4687