Please review the following patch which addresses: