MLHR-984 #resolve