Sync with some changes on MC.