Tested to 3.9.1