MLHR-1363: code review changes