Optimize the optimized container

Closes #3571858

Merge request reports

Loading