Merge "Improve docs for generated properties in PropertyMapper"