Added some metadata to modules and assets.
Some refactoring in xml module in order to reduce repeated code.
(cherry-picked from 1bb5c27)
Remove todos from deprecated 'core' module.
(cherry-picked from 3610e67)