Truncate excessively long keywords when importing
Merge branch 'dev'