Merge branch 'bug-1010' into release