Backport of issue #114
Merge branch 'hotfix-4.1.5' into support-4.1