Merge "Further tightening leak detector checks" into main