Fix potential MRO conflict in Crypt class.
Merge branch 'fix/1924-mro-conflict' into develop