NEXUS-6591: Fixing on-the-fly added deps and coords