Mock Pull Req to review changes for monitoring

Some of the changes are from other commits.
Commits in this pull req include some made by others + merges from R1.10.