LPS-35416 Reindex baseModelClass