Manually merged banana branch.