Merge branch 'bug-953' into release