Revert "Remove not used classes"
This reverts commit 4848b5fb2b4ff00a3d94002d1f0653cd91623c9e.
Merge branch 'master' into return-wizard
Merge branch 'return-wizard'