refactor: client will be mandatory in next major release; update code to support the change#2623
Merged
client will be mandatory in next major release; update code to support the change#2623