Issue #3307230 by bbrala, catch, phenaproxima, Spokje: Backport RDF/views integration changes to 9.5.x