jflteusc: deunify
Merge pull request #538 from dcd/cm-12.0

jflteusc: deunify