LPS-30514

I've made the changes requested by Minchau