Add OC and simple gov into msm2
GPU: Fix merging issues & + tweak