Merge branch feature/camille.perin/java-binding with refs/heads/master into...

Merge branch feature/camille.perin/java-binding with refs/heads/master into refs/merge-requests/130/train