Made the CERN version
Merge commit '8341027'