Merge "Refactoring rename of PipKeepClearAlgorithm"