Merge "API: Allow for documenting individual values of 'prop' parameters"