Merge remote-tracking branch 'skl85/hotfix-extautodetect'