Merge branch 'bug-957' into release