Added check on PropertyValue in variantPropertyValueListByProperty method
merge error fix
Fixed merge conflict