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