Merge "improve presubmit checks" into main