Merge "Do not prepand randomo str in key for vFW_NextGen"