Set  autoload to false
Merge branch 'refs/heads/factory-no-autoload'