Merge "Fix autoloading of ExportProgressFilter"