Merge "Revert "Add CUJ instrumentation for KQS"" into main