[master] Merge in fixes to everdale.