merged Max's developments into ontology branch

Sabine Schröderrequested to merge
lensing1-master-patch-14179 into ontology

Max did not push directly to ontology (or did the merge) -- now catch up on this while cleaning up

Merge request reports