Merge branch 'bug-954' into release