x-T Measure + bug fixes

Merged Ghost User requested to merge version2.2 into master

Merge request reports