WS244 development patches

Merging ontology browser work to master -> production for the WS244 freeze.