Merge branch 'bug-967' into release