Merged v.next into editing_samples.