Merge pull request #4713 from metalbear-co/skreborn/improve-flake-detection