8 update from 7.0

This can be removed