Sergey Plaunov

Yes. Or maybe just let's review what is done in this PR and then decide about next steps.

I would not say it's the same. #2428 updates the token but not traits and metadata.

The fix has been merged form some other branch. Only the test change has been left not merged.