New PR with merges