Nov12

Creating pull request for code review. See comments in diff.
Make sure you use the same names as the CM, if you have better name, pass it on the CM team so they can update their CM. Otherwise, follow the CM.