Merge "Starting to tighten leak detector checks" into main