Updated from commit 0a40b7d4203c19ff3db5586f77a0f457b1b36068.