Merge "update docker images"