Firstime wizard could not complete due to wrong DB name
Merge branch 'develop' into release/1.7

* develop:
  Firstime wizard could not complete due to wrong DB name