Merge branch 'bug-1341' into release