For rabeeh

Hi Rabeeh,

here are a few changes that you might consider for 3.6.9.

Cheers !