Merge branch 'bug-1200' into release