Merged refs/pull/6132/head from repository cms-sw
Further fixes as requested by Andreas Pfeiffer