Merge branch 'feature/JAL-3187linkedFeatures' into