CIDEVSTC-183 Integrate and Validate with Production System

add comments/documentation and refine debug