MDL-23106 external_tokens created in one step