rev 11593 : imported patch 8034842-par-free-cset-old rev 11594 : imported patch 8034842-erikh-review