Merge "Refactoring to support PII changes" into sc-dev