Merge branch 'defxx-next'