PROD-7180 #resolve