automerge (cherry picked from commit 8b14eb9020) Co-authored-by: Michael Vines <mvines@gmail.com>
8b14eb9020