4.0: Merge log and check tools