MODULES-154 Support layers and add-ons
MODULES-154 Tests