Adding custom modules/features from develop branch
Adding contrib modules from develop branch