it seems like we’ve piled up a few changes on master that could / should be cherry-picked