Merge branch 'bug/JAL-3567virtualFeatureCoordinates' into develop