SONAR-3843 Fix issue with submodules