Merge "post process the system properties"