Merge Sunanda's branch.
Merge pull request #2514 from ianna/hgcal-algo

Merge Sunanda's branch