Optimized Module code
Merge pull request #3912 from bsunanda/Phase2-shk21

Phase2 shk21