DR modifications following dry-run.

JIRA:

DESCRIPTION: