Hi,
Please find new patches realigned with HEAD. There were conflicts withcommits done recently.
Thanks,-- Michael