Synchronized with the source at f01ede6fbb065aca537944728cfeb10f6bb3545e.