Version 2.6.0-specific changes for release

Version 2.6.0-specific changes for release