Release engineering for v6.98