Manual merge from partner
Manual merge from partner, new files