[MVSD-634] MVSD-634