> Peter, shall I update the patch as Amitha suggests?

Certainly; sounds good to me.

--      Peter.