Update to 3.8.7 and sync