changes for the marketing library module
merged changes from develop