Rename setImmediate.
Merge branch 'dev' into dev-normalize-terms