#JC-1945: Added javadoc