cherry pick install changes