Merge branch 'entity_raw_id_fields'