MFH: r371161

Fix plist with NLS
While here sort plist

PR:		194444