Merge "Fix parsing of fields parameters"