Added through 1.11