FALCON-228 Build failed on build-tools module. Contributed by Jean-Baptiste Onofré