Rebased with 10.1.x

Gauravrequested to merge
issue/drupal-3332444:3332444-refactor-claro-system-admin--admin-lis into 10.1.x

Closes #3332444

Merge request reports