Remove token dependency

Closes #3496998

Merge request reports

Loading