Back port cancel functionality from develop