Merge branch 'bug-637' into release