Merged refs/pull/5288/head from repository cms-sw
Simplify customisation