Gaby: ontology changes were again lost in commit 836acc791b95a1773e2c0f4660ee70a29fd4ca94. Please learn to merge without killing submodules.