First step to leave the deprecated OGraphDatabase API
Merge branch 'optimize_connection'