Merge "[W] Introduce new onFailure callback with resultCode" into main