CDB-463 the problem was there when the wizard was just initilized
Merge remote-tracking branch 'origin/feature/CDB-463' into release/2.1.3.5