Merge MPOS changes