Integration, exposed

Integration round 2018-08-31 - highway to 3.6 and beyond