#ML-26 Fixed
Cosmetics: uniform types order also done.