Merge changes by Peace-Maker