issue #1489: Updates with upstream.