New and updated in 3.6.0