LPS-44734 SF?

Hey @moltam89 

I think this is a more generic fix. I have tested your steps and it seems to work. Could you please verify if this is ok for you too or if you foresee any drawback? 

thanks!