Merge branch 'Duplicate-Site-Modules'

Merging Dupe changes with Master.