Issue #2074977 by amontero: Add token support.