Merge "Change default value from NONE to UNKNOWN" into sc-dev