Merge "Bottlenecks testcase rebuild"