Merge fixes in r10.11