Tested up to 3.9.0