MLHR-813 #resolve
Merge pull request #894 from andyperlitch/MLHR-813

MLHR-813 #resolve