Merge "Fix uninitialized crypto pattern" into nyc-dev