Execute autoload with -X option
Merge in upstream changes