Changes requested from upstream