On a related note, the new tests added with OGM-907 run rather slowly on my machine. May be related to this issue, in any case some profiling should be done here.