Merging upstream for delivery

We have done most development in forum, and are now merging upstream.