[#1013] Move batch package.
Move import order.
Merge pull request #1027 from akbargumbira/develop

Fix #1013
Merge pull request #1029 from ismailsunni/fix_wizard

Fix wizard
Merge remote-tracking branch 'origin/develop' into fix_tests