Additional changes in Branch1