v2.6.4 - v2.6.9 - Minor updates

These releases contains minor bug-fixes to prevent issues in edge-case scenarios.