Make readme updates
Add missing undefined check
Add UT
Remove comment
Remove double comment
Merge branch 'dev' into monitoring