feature #2097: Fix error in mvds
feature #2097: Improve CD management for MVDS