Task #0064: MSD final implementation and test fixes.