Merge some fixes from r10 maint branch