Lot's of updates for the v3.6.0 release