[master] Merge in shower, everdale and dq8.