Updating to version 2.8.6.
Merge branch 'release/v2.8.6' into develop