Updated from commit 30aab9a6b2383bfa930a868c08037b304d93a9bd.