Revert "merge DataMCType"
This has to be reverted, as it did nothing then to change back files which have been modified by the previous commit (merge code from Vladimir). Something went wrong

This reverts commit 99c78d61cc14067ac779800a662d77b73cf6ebbf.