Merge conflicts resolved, update version info for dev 1.8.7