Merge branch 'bug443'