[Merge] Small changes after merge