Remove MAX_OCCUR limit, add references when mergin refs #6366