Implemented changes similar to https://github.com/vitessio/vitess/commit/c8ccf37e3d77fa4df761c92e4ec8b1d17ac2c726#diff-8ddd8af3d810b9a1c2bf9650ebed76e7
Implemented changes similar to https://github.com/vitessio/vitess/commit/c8ccf37e3d77fa4df761c92e4ec8b1d17ac2c726#diff-8ddd8af3d810b9a1c2bf9650ebed76e7

Signed-off-by: Ryan Leonard <47430ee2ef6991887dd6db18d0a6875382685615@spruce.com>

vitessio/vitess,tinyspeck/vitess,tinyspeck/vitess,tinyspeck/vitess,mahak/vitess,mahak/vitess,tinyspeck/vitess,vitessio/vitess,vitessio/vitess,vitessio/vitess,vitessio/vitess,vitessio/vitess,mahak/vitess,vitessio/vitess,mahak/vitess,mahak/vitess,mahak/vitess,tinyspeck/vitess,mahak/vitess,tinyspeck/vitess,mahak/vitess,vitessio/vitess,tinyspeck/vitess