[QA] Review merge

Updated as per clearinghoused