Merge "Fix security vulneratibly 31960359" into nyc-dev