Merge tag 8.7.11 to develop
This tag has no release notes.