Merge OC current changes