Please review the attached patch for:

Thanks,
-- Matt