Changes merged from the Microsoft 2270 release