Merge pull request #373 from eurogiciel-oss/XWALK-2370