Thanks for the PR @matrixise

I would prefer to wait that the PR on master be merged first, and the use the squashed commit hash on that PR to be cherry-picked (either manual git cherry-pick, or using cherry_picker.py

Reasons:

• if we need any changes made to the original PR, we don't need to update the backport PRs
• when we cherry-pick the squashed commit hash, the original PR gets linked to the backport PRs automatically.

Do you think you can help me with backporting GH-1306 to 2.7 please? I was supposed to do it but came across conflict and got distracted with PyCon 😅 Thank you! 😄