CROSS-1294: Fix next version after release (part 2)