Merge pull request #783 from jburel/modulo-stable

Modulo stable Merging before we start test refactoring.
Update submodules