Is this part of the service update? Or could it be a separate PR & unblocked from being merged?