Merge "Use SDC 1.6.5 containers" into frankfurt