Merge branch 'bug-896' into release