Merge "Add warning log for when CUJ times out" into main