MLHR-1068 #resolve