Merge latest upstream developments