Updated from commit 80d8df4da7822b3d334e436986d52f737cf2a150.