Finalize initial version in new style

(from redmine: created on 2018-02-18)