Merge branch 'bug-959' into release