Merge "registration: Load extra autoload files before executing callbacks"