Merge "Add more utility methods for CTS"