Merge pull request #2351 from TDT-AG/pr/20181204-modules