Merge "performance test initial work" into jb-mr1-dev