merge 3.0-pinned-containers