Merge branch 'deps/crypt-local-fork' into 'develop'