8 maintenance

Merging my latest 8_maintenance changes into master