[PLAT-5390] Allow client to be passed in the constructor. Always pass a client when available.