server side support of PLFM-1710 and PLFM-1707