LPS-34081 Apply changes
LPS-34081 Fix broken DL reference handling