Merge "Reduce some unnecessary warning logs" into main