Reduced redundancy; added important missing fields.
More flexibility for request links (work in progress).
Merge branch 'master' into wcdiscovery