Merge "Remove empty modules" into tm-dev