MLHR-685 #resolve