Merge "Allow aliased field names with separated syntax"