Update code to reflect new upstream commits.