Reintegrated changeset 7290 which is needed for running in debug mode at IDRIS/Jean-Zay. See ticket #794