PROD-11651 #resolve