Release engineering for 6.84