Merge branch 'ae/pack-autothread'