Fix account import in 0.6
Merge branch 'dev' into release-0.6.14