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