Release engineering for v6.99_18