Merge branch 'feature/JAL-3187linkedFeatures' into feature/JAL-3251biotypedMappings