Fixes #191
Merge branch 'hotfix-5.3.8' into support-5.3