Merge branch 'develop' into cryptable
Merge branch 'crypto' into cryptable