Merge "Refactor compare_images"