Merge "Also merge user provided append args." into emu-master-dev