Sync with CM10/FXP