merged in cherry-picked service discovery changes