Merge branch 'radius-ext'