Merge some changes from uvcmetrics devel branch