MLHR-734 #resolve