Update from upstream
Update with paste mode