MLHR-947 #resolve