Merge "Use per character suffix for multi image"