Fixed flow conversion units
Merge branch 'hotfix-flow-cmph'