Re: #1257 performance enhancement
Pulling changes from neo4j/master