Initial merge of Add People to QA