commontoken
Merge branch 'commontoken' into mthive-0.11