Merge from internal wiki.