Merge FTS-1925_token_project work into develop

Now that the DC2024 is over it's time to re-sync the development and the FTS-1925_token_project branches