This is master's diff.