MLHR-1435 #resolve