Merge "Improve logging in ManagedServices" into main