BUG-10908 0.6.4 mid-sprint release
Merge branch 'release/0.6.4' into develop