Merge branch 'skip-crypt-test' into 'develop'