2010-02-23 Code Review

Proposed tickets to cover:

  • #2086

  • #1686

  • #2017

  • #2066

  • #2097

  • #2039