MLHR-1328 #resolve