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