49231655 Fix lookup of keys in wrapped dictionary and property handling
for decorated model properties.