Bugfix using proper 2.1 version of isMetric()
Merge branch 'release/2.1'