Merged upstream into GitHub