Please review the following patch that addresses: