Merge with latest PMS