Updated from commit d0aef118ac7d64a84b5984be2a2e0e207e475f1d.