Hi all,

please find attached the third iteration of this patch addresing review
comments.

Thanks

  Andrea