Merge branch 'bug-1046' into bug-1042