Issue #3616202: Use rebuildContainer instead of rebuildAll

Built on top of !16539

Merge request reports

Loading