Merged with upstream master