Re #1580 - OOC/NC logic fix
Merge origin/neo4j