MLHR-934 #resolve