Merge "Add docs section on config options to reviewers guide"