GPDS code refactor for uniformization

Merged Jérémy Destin requested to merge refactor/uniformize into master

Merge request reports