Merge changes from updatream.