[master] Merge in dq8 and shower.