sync changes with xrm

Sebastian Listl requested to merge 2029214_permissionSorting into main

Merge request reports