Merged upstream.