Merge branch 'sp/complete-ext-alias'