Namdv, Please check new coding for EBM-123 and merge code

Namdv, Please check new coding for EBM-123 and merge code