Please review this patch which addresses the following ticket:

-- Matt