Feature 10296 Pip Standardization