Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken * commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db': Update API and javadoc according to API review.
Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken * commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db': Update API and javadoc according to API review.