Merge branch 'bug-1273' into release