Nov12

Creating pull request for code review. See comments in diff.
Use the same terms used in the CM, namely: NORMAL, RUSH.