Merge "Add support to update the registered service in place" into main