Merge "Bottlenecks: run env preparation inside the container"