MLHR-1363: more code review changes