Nightly: Version 2.2.6.1

Fixes for breaking changes.