[master] Merge in coa and everdale.