NEXUS-6731: Fix and UT

To ensure that MD maintenance happens without classifier passed over