Crypsis cleanup (part 2)
Merge pull request #2059 from mahagr/feature-hmvc

Crypsis cleanup (part 2)