Merge "Response stats:counts are not updated sometimes" into main