Debug out of range comments
Merge pull request #4572 from bsunanda/Phase2-hgx21

Phase2-hgx21