Includes joint work with @abmclin, @pmatos, and @jessealama. original commit: 70559d074f70dcadec5cea3619f75f91fcda77eb