prepare release 1.6.4
Merge branch 'qa' into develop