Merge "Bottlenecks: bugfix for missing SCENARIO parameter"