Merged upstream changes to the English version.
Updated according to the latest changes in upstream.