Merge "Support chose permissions for vendor property"