cherry pick
Various changes