Merged module dependencies (version 2.0.0)
(cherry picked from commit 15d6975)
Sorting of XML elements
(cherry picked from commit bebede8)