Merge remote-tracking branch 'origin/revert_tinkerpop-2289' into tp33