Merge "Fix crash when changing encrypt with credential" into nyc-dev