Sync with new upstream version