LPS-34188 Missing namespace / delegation error fix

Hey Julio,

The export restructuring is in master, but somehow the namespace got lost. Can you please merge this?

Thanks,
Levente Hudák