Merge branch 'bug-1011' into release