Merge remote-tracking branch 'origin/prune/jsonner-namespace-roles' into prune/jsonner-namespace-roles