Resolve "Ordering specified in include not followed"

Merged Lauri Himanen requested to merge 1564-ordering-specified-in-include-not-followed into develop

Merge request reports