Merged refs/pull/4734/head from repository cms-sw
Fixes for FULL case