Merge "Bottlenecks committer update"