DDF-727 - preparing for the next development version