Merge branch 'corvuscorax/OP-1483_leaky-integrals-and-post-filtering' into next