Merge "Support more types for set property cmd."