Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev