Resync with changes from upstream