Merge "Autoloader incorrect case warnings fixed"