Merge branch 'bug-1034' into release