Merge branch 'bug-922' into release