MLHR-739 #resolve