automerge (cherry picked from commit fb8612be49) Co-authored-by: Greg Fitzgerald <greg@solana.com>
fb8612be49