Merge "Fix DvrClient data type" into tm-dev