[master] Merge in everdale and dq8.