Merge "Add product system server compiler filter property"