fix #954
Merge branch 'fix.954-backport' into 1.4-branch