Re-merge (deltas already captured by cherrypick?) of 5f96