Upstream changes
Beautiful new upstream version
Merged upstream changes