MLHR-1168 #resolve