mrtracy Merge pull request #3475 from mrtracy/mtracy/code_review_feedback …