Merge "Support more types for set property cmd." into sc-v2-dev