[AMOS commit] MDL-20636 Fix 30 TODOs Committed into Git: 2011-02-24 17:47 UTC