[master] Merge in everdale changes.