Introduced in #473
Introduced in #473