[REQS-298] Improved javadoc