Missed changes during the merge