Commit after checkout code from Win8_Branch