Reverted back removed submodules used in manual tests.
Merge