Merge branch 'hotfix/5862'

Close #5862
Close #5688
Fixes #4948