Merge "removing incorrect/redundant SDNC overrides"