Merge "Add bottlenecks 7.1"