Keep 7.0 API for done/cancel