Merge "Fix reading entity"