backport for TESB-9056 - [locator] failed if client.getConduit() called