Sync with last jena version