Comment by benbruscella

Cherry pick those commits into another set of PRs