Pim 3196 bis bis

I really don't understand the purpose of this merge.