Delivery merge forum into development

We have used the forum branch to develop most of the functionality lately, and we are merging this upstream.