Various Crypsis Fixes

This pull request should be used for reference of incoming changes. It contains some merges from external remote branches.

References: #2585