LPS-43652 Standardize
LPS-43652 Regenerate