It sounds this would be fixed by #2493559: Chained tokens for field tokens.