Merge branch 'bug/JAL-3139colocatedFeatures' into develop