Merge "MBO-OCE feature support (phase 1)"