CSIT-986: Implement proposed MDR improvements