Upgrading to core 0.87.0.
Forgot to remove the comments.
Merge pull request #645 from realm/kg-core-0.87.0

Upgrading to core 0.87.0.
Merge branch 'master' into bp-adapter-test