Fresh version of #1670 off the latest main. Mostly fixing documentation wrapping.
Co-authored-by: Carter Anderson <mcanders1@gmail.com>