Merge branch 'aj/xfuncname-ada'