Merge branch 'features/JAL-3010ontologyFeatureSettings' into