mergin in latest updates to original COPS