Issue #3354175: Add token support

Laurens Van Damme requested to merge issue/environment_indicator-3354175:3354175-add-token-support into 4.x Apr 14, 2023