Merge branch 'auto-detect-stable'