Add the scenario with HE Rebuild
Merge pull request #2796 from bsunanda/Phase2-HE30

Add the scenario with HE Rebuild