Merge "Cutout emulation: string changes and ordering" into pi-dev