Merge 3rd-party oe-a