Merge branch 'features/JAL-3010ontologyFeatureSettings' into merge/JAL-3187_JAL-3010