Merge fixes in r10 maint branch