Merge branch 'features/JAL-2228_efficient_featurecounts' into develop