Bug 875400 - Incorporate add-ons into environment