Merge branch 'bug-372' into release