Issue #20154 Add natural keys to ext models.