feat: Update access logic

Closes #3587941

Merge request reports

Loading