CERN patches review

Please review