Merge branch 'hotfix/4246'

Close #4246