Sync with MCedit unified 1.2.1.x