Updating to version 2.6.4.
Merge branch 'release/v2.6.4' into develop