LPS-28494 Test

I didn't do anything apart from rebasing the old commits. Please let me know if there's anything else I could be of help with.

Thanks,
Daniel