Merge "fix pfw criteria generator on S"