Merge branch 'dev' into 0.6.4