Big refactoring of making VO solo ID generator
Merge remote-tracking branch 'origin/master'