Added jetm measurement feature
Merge branch 'develop' into release