Merge "Fix issue with set but unused variable" into emu-master-dev