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