Merge branch 'bug/JAL-3612_overviewFeatureOrdering' into develop