fix for use disabled autoloader
Merge origin/master