Wizard package reorganization automerge: 566425b
automerge: 8fc185c

* commit '8fc185cb99ac9d9c317ea7838b1c79009634e9a2':
  Wizard package reorganization