Synchronize with WIP upstream version