Merged refs/pull/3333/head from repository cms-sw