DAR-1711 | Rail lazy loading - namespaces tweaks