Merge branch 'glapi-reorg'