PH: Merge Conflict fix 1