MS changes
resolved conflicts