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