Merge --integrate into [12c30d33d477c812]