Merge "Fix ClinitCheck pruning."