Fixed an issue that would lead to scattered autoloading files
Merge remote-tracking branch 'olvlvl/fix_issue_2598'
Fix CS