Merge "Update documentation for settings, affiliation API" into rvc-dev