Merged with MSFT's 1.1 version