[geo-ghci-int]

Backport of #4044 to 1.21

Error on cherry-picking: 3d6a926, ac1b92c, 9fbf79f, d7379be

To continue do:

git fetch && \
  git checkout ghci/backport/4044-to-1.21 && \
  git reset --hard HEAD^ && \
  git cherry-pick 3d6a9267272c5f0d045d56f19cbcc03e312038a1 ac1b92cb0fa0d09b13dc6864f9914ad8cf114a3a 9fbf79f645f54a4b7c6dbd1bac0cf7ea508316d9 d7379be6387b01d576fb4a9969e399fe2f9b2caa

Resolve the conflict, then:

git add <file> && \
  git cherry-pick --continue

When all the conflicts are resolved, push the branch:

git push origin HEAD:refs/heads/ghci/backport/4044-to-1.21 --force-with-lease