EI-1040: Next development version