Fix client build 18414