Merge branch 'ds/bitmap-lookup-remove-tracing'