Merge "small, multi-platform docker images"