MLHR-1156 #resolve