Merge "Cutout emulation: string changes and ordering"