[master] Merge in changes from dq8 and contact.