Merge fix. XML streaming for images. FB 4309.