Changes where role check for FSA is done

Closes #3276516

Merge request reports

Loading