clean for final release
Merge branch 'release/2.2.6-Final' into develop