Applying Sylvain's commit to the new global repos. We need to keep both up to date, so as not to loose changes!