Merge in latest upstream

Merge in latest upstream