Merge branch 'bug-1176' into release