Updates for 2.6

Updates to bring content and examples to be consistent with 2.6 release.