Merge branch 'release/3.6.4'