Re-added missing imports
Merge branch 'master' into hooks