Emi - Bug fixed 3021
Merge