[DO NOT MERGE] Transactional fix backports to v1.6.x

[edenhill]

Do not merge this, since it is already on the correct branch (1.6.x).

[cla-assistant[bot]]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 3 committers have signed the CLA.

:x: edenhill
:x: ajbarb
:x: patrick-premont
_{You have signed the CLA already but the status is still pending? Let us recheck it.}