Merge "2.8.7.0 release"