Merge branch 'release/8.7.0' into production
Merge tag '8.7.0'

Release 8.7.0