Back port #701 to 5.7.x

[YuryAndr]

Back port for #701

[michaelklishin]

@YuryAndr thank you. May I ask you to submit the same thing against 5.13.x-stable as well?

It's a very PTO heavy week on our team but we should be able to produce a release in the next few days.

[YuryAndr]

@michaelklishin It was already provided for 5.13.x-stable by @acogoluegnes

[acogoluegnes]

It's indeed already backported to 5.13.x-stable. Backporting to 5.7.x is not necessary because we will not release any 5.7.x now, it's only 5.13.1 or 5.14.0. Moving from 5.7.x to 5.13.x or 5.14.x should have no impact.

[YuryAndr]

@acogoluegnes Ok. We will move to 5.13.1 and try to test some corner cases. Thanks!

[acogoluegnes]

Have you tried the 5.13.1 snapshot? If you're fine with it, I can release 5.13.1 in the next few days and make the announcement later.

[YuryAndr]

@acogoluegnes Yes it looks working fine for our cases. Please, release 5.13.1

[acogoluegnes]

5.13.1 is released.

[YuryAndr]

Thank you!