Honor option "module_attachment"
Merge pull request #1743 from SoftCreatR/patch-3

Honor option "module_attachment"