Release/2.8 minor changes -- merge this first.