Merge "Fix security level display" into nyc-dev