Merged refs/pull/3588/head from repository cms-sw
Fix of Fix