Merge "Add CUJ instrumentation for KQS" into main