Merged with upstream