MLHR-785 #resolve