Emi - Various bug fixed

Deployment Version: 1.4.0.114