core to 0.6.1_3.8.7-1