Merge fixes in r10.9