sync with CERN module changes