Updating to version 2.8.7.
Merge branch 'release/v2.8.7' into develop