LPS-39178

Hi guys,

Sorry for the bug I had introduced. I still think (now even more :)  that we would need some tests to ensure the feature is not broken. Since I know that can be tedious I have started them for you, now you only need to add your use case to the existing class following the pattern. (Feel free to test as many scenarios as you can).


I also had a question, why do we need to set the Virtual Layout in the request?


In order to avoid backporting too much, we can just backport your changes and my first 2 commits. does it sound good?


@zsigmondrab