Increase timeout from 20 to 60 seconds.
Drop from 1000 to 500 to make test work.
Increase import_parse timeout to 90 seconds.
Merge branch 'master' into rel-lagrange