Merge "Updates for new DFC endpoints.json and DR latest"