Merge of recent 0.8 (very minor changes) to establish the bridge for future easy merges of fixes from 0.8

Recent <2.6 fixes were not even merged (-s ours) but now we would get a 'bridge' so if anything fixed in 0.8 we could still easily merge (instead of manual cherry picking)