Merge "Refactor image writer"