[master] Merge in touchups to coa.