Merge "Fix issue with ImagesOneServerJSON test"