Updated from commit 9e3154220c3f072c8906b80b0e963fec6594a2df.