Merge branch '114-fix-custos-token-refresh' into 'dev'

Resolve "Fix custos token refresh"

Closes #114

See merge request !87