Release engineering for v6.87_04