Optimum merging

Please merge ocpndc improvements