Merge "Fix entityId bug"