Release engineering for v6.97_02