Merge "Resolve change in getService return type" into main