Updates from external branch.