Update to 3.8.7
Update to 3.8.7