PROBCORE-453 PROBCORE-470 Codereview - minor improvements, javadoc
Merge remote-tracking branch 'origin/develop' into develop