A better check when importing keys.
Merge branch 'test' into dev