Merged refs/pull/4718/head from repository cms-sw
Fix FULL