Added 1.8.7 ff77435c7c254737e7bccb79f2bacefbd4902039