Merge "Bug-Fix: Fix clean_image flag does not take effect"