Release engineering for v6.96