(cherry picked from commit a1adcb23b6d62c5fc0b08193a2d2c8106448c87f) Co-authored-by: Justin Starry <justin@solana.com>