MLHR-930 #resolve