Merge "Fix client tracking" into jb-mr2-dev