backporting fix to issue #210
Merge branch 'hotfix-5.3.10' into support-5.3