Merge MTD fixes into -next