API for 3.9.0