[DZ-583066] Alteration to autoload