Release/2.8

Updating develop from the changes that have been made to release/2.8.  This will be a bit big
so we need to inspect it carefully.