Merge pull request #2442 from vlakoff/develop-3

Do not trigger a possible custom autoloader, as it is irrelevant here