[master] Merge in everdale.