Return an empty model collection instead of `null` (see #6147)
Restore the `User::getData()` method (see #6146)