PROBCORE-453 Reviewed Main, adding Javadoc and refactoring.
Merge remote-tracking branch 'origin/develop' into develop