Merge from Office
Modified some comment