Group competence line order

Merged Eric Horvat requested to merge 8.0-FIX-competence-line-order into 8.0-stage

Merge request reports