Merge branch 'bug-1131' into release