backported autoloader fix; updated submodule references