Added support for Enquiries features testing
Merge branch 'master' into ConsumerBasket