DNN-3820 - client-server integration