LPS-33427 SF

@sergiogonzalez these changes break a test in DL Subscriptions. Can you please review our changes?
Should we add a test for these changes too? 

thanks!

cc @jmnavarro