Merge "CSIT-476: NDR plots update"