instant tokens loaded without controller
controller added when loading instant tokens
Merge remote-tracking branch 'origin/feature/loadingInstantTokens' into develop