Merge "Add a class for retrieving server flag values"