Merge branch 'develop' into feature/JAL-3187linkedFeatures