[TECHNICAL SUPPORT] LPS-37605

Hi Tamás,

You are already familiar with this issue, based on @zberentey's help I rewrote the fix. Now it covers all of the cases we checked.

I also discovered another issue which realted to page versioning during the test phase, but I verified it's not a regression caused by my fix as it's already exist on the master branch.