Fix last merging from master.