Rebase from 'upstream'
fix install rules