Merge "Refactor bufferhub token to be more secure"