Jenkins issue/6101 all classes autoloadable

PR to satisfy jenkins for #12443