MLHR-1313 #resolve