Merge branch 'bug-1442' into testserver-1260