Added missing changes after merge