Merge "Refactoring rename of PipKeepClearAlgorithm" into tm-qpr-dev