Hi all,

the third iteration of this patch is attached addresing review comments.

Thanks

  Andrea