fredwes

Hey @legobeat , is this PR ready to merge?

Is there anything I can do to help get this merged?

Sorry to keep bumping here but our users have reported issues adding tokens due to this. @legobeat any update on getting this merged in?