Merge "Replace macro arguments when applying replaceTokens" into main