Merge branch 'bug-1198' into release