check
java client
check
Merge pull request #1137 from john-hill/PLFM-2384-c

Plfm 2384 c