updated version to 3.6.4
Merge branch 'master' into sts-tooling-model