Yes probably, but that depends on what we do with HSEARCH-1498 ..
I'm looking forward to reorganizing the various dependencies but it's too early to decide.