Merge branch 'bug-976' into release