Synchronized with the source at 1c0de576c4ca66aadb15d41a5fde9cace11be461.