Merge "Refactoring CTS to remove PTS references." into klp-dev