Merge branch 'feature-s/3533-set_tokens_everywhere' into 'dev'

Feature s/3533 set tokens everywhere

Closes #3533

See merge request !323
5 jobs for dev in 7 minutes and 23 seconds (queued for 2 seconds)