MLHR-1126 #resolve