MLHR-680 #resolve