Added missing changes from latest merge