Merge "Fix -verbose:image errors"