Rebase from 'upstream'
installation patch