Consumes migration -- HCAL

This cleans up merge conflicts in #923. The merge conflict is due to the same change being in two different branches with git being confused about it. So this is effectively identical to Salavat pull request.