PLFM-1472 Java client part and changes for code review feedback