[389-devel] Please Review: (555955) Add CoS merge support