Please review the following patch which addresses:

It has been tested by: