Merge branch 'r10-maint'