#MLHR-719 #comment Changes due to refactoring of library classes.