Merge-update from upstream