Reapplying !1418 (token_fixes) to next

As the token fixes to master (!1417 (merged)) were reverted due to compiler incompatibility (!1425 (merged)) and because following development branches were based off of master. The revert was indirectly also applied to next as a consequence of the development branch being merged into next, and having master as parent.

Therefore the token fixes (!1418 (merged) for next branch) need to be reapplied, which this MR is doing.