CON-1486

Please add jira ticket for reference