Merge updates from the we talk project.